stdenv/linux/bootstrap-files: add mipsel-linux (mips32)#183487
Merged
lovesegfault merged 1 commit intomasterfrom Aug 17, 2022
unknown repository
Merged
stdenv/linux/bootstrap-files: add mipsel-linux (mips32)#183487lovesegfault merged 1 commit intomasterfrom unknown repository
lovesegfault merged 1 commit intomasterfrom
unknown repository
Conversation
Author
|
Ping @lovesegfault |
1 similar comment
Author
|
Ping @lovesegfault |
Author
|
@lovesegfault, could you please upload these files to |
Member
|
Done: $ aws s3 cp --recursive --acl public-read /nix/store/i46mrzinxi9a5incliwhksmk947ff4wn-stdenv-bootstrap-tools-mipsel-unknown-linux-gnu/on-server/ s3://nixpkgs-tarballs/stdenv-linux/mipsel/5bd14b3cfe2f87a2e2b074645aba39c
69563e4bc/
upload: ../../../../nix/store/i46mrzinxi9a5incliwhksmk947ff4wn-stdenv-bootstrap-tools-mipsel-unknown-linux-gnu/on-server/busybox to s3://nixpkgs-tarballs/stdenv-linux/mipsel/5bd14b3cfe2f87a2e2b074645aba39c69563e4bc/busybox
upload: ../../../../nix/store/i46mrzinxi9a5incliwhksmk947ff4wn-stdenv-bootstrap-tools-mipsel-unknown-linux-gnu/on-server/bootstrap-tools.tar.xz to s3://nixpkgs-tarballs/stdenv-linux/mipsel/5bd14b3cfe2f87a2e2b074645aba39c69563e4bc/bootstrap-tools.tar.xz
$ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv-linux/mipsel/5bd14b3cfe2f87a2e2b074645aba39c69563e4bc ./
download: s3://nixpkgs-tarballs/stdenv-linux/mipsel/5bd14b3cfe2f87a2e2b074645aba39c69563e4bc/busybox to ./busybox
download: s3://nixpkgs-tarballs/stdenv-linux/mipsel/5bd14b3cfe2f87a2e2b074645aba39c69563e4bc/bootstrap-tools.tar.xz to ./bootstrap-tools.tar.xz
$ sha256sum /nix/store/i46mrzinxi9a5incliwhksmk947ff4wn-stdenv-bootstrap-tools-mipsel-unknown-linux-gnu/on-server/*
3841a02c938b9d5f9aa1bb1bf8ff266370e9f2a6de54e0c11fac7769413f3063 /nix/store/i46mrzinxi9a5incliwhksmk947ff4wn-stdenv-bootstrap-tools-mipsel-unknown-linux-gnu/on-server/bootstrap-tools.tar.xz
ba0645bb4a626f0a3fe4f30f0b92211c41482f0604825f1d1cab99e1e42d1bd9 /nix/store/i46mrzinxi9a5incliwhksmk947ff4wn-stdenv-bootstrap-tools-mipsel-unknown-linux-gnu/on-server/busybox
$ sha256sum ./bootstrap-tools.tar.xz ./busybox
3841a02c938b9d5f9aa1bb1bf8ff266370e9f2a6de54e0c11fac7769413f3063 ./bootstrap-tools.tar.xz
ba0645bb4a626f0a3fe4f30f0b92211c41482f0604825f1d1cab99e1e42d1bd9 ./busyboxAs always, very sorry for the delay in getting to these! Let me know if this can be merged :) |
Author
|
Thank you so much! If you have time to do the same for #185182 I would appreciate it.
Yes, it is ready to merge. From an empty |
This was referenced Aug 19, 2022
13 tasks
12 tasks
12 tasks
fgaz
added a commit
to fgaz/nixpkgs
that referenced
this pull request
Jan 21, 2024
This PR updates the bootstrap tarballs for riscv64-linux with new Hydra-generated ones. Fixes NixOS#275848 (bootstrap assembler too old to build gcc 13). I'll be following the script used in NixOS#151399, NixOS#168199, NixOS#183487, and NixOS#188334. Files came from [this](https://hydra.nixos.org/build/246376732#tabs-summary) Hydra build, which used nixpkgs revision 160cedc to instantiate: ``` /nix/store/cpiajh4l83b08pynwiwkpxj53d78pcxr-stdenv-bootstrap-tools-riscv64-unknown-linux-gnu.drv ``` and then built: ``` /nix/store/8a92pj40awdw585mcb9dvm4nyb03k3q3-stdenv-bootstrap-tools-riscv64-unknown-linux-gnu ``` I downloaded these files from Hydra and prefetched them into the nix store with the following commands: ``` STOREPATH=8a92pj40awdw585mcb9dvm4nyb03k3q3-stdenv-bootstrap-tools-riscv64-unknown-linux-gnu OPTIONS="--option binary-caches https://cache.nixos.org --option trusted-public-keys cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" nix store prefetch-file \ file://$(nix store add-file --name bootstrap-tools.tar.xz $(nix-store ${OPTIONS} -r /nix/store/${STOREPATH})/on-server/bootstrap-tools.tar.xz) nix store prefetch-file --executable \ file://$(nix store add-path --name busybox $(nix-store ${OPTIONS} -r /nix/store/${STOREPATH})/on-server/busybox) ``` These commands produced the following output: ``` Downloaded 'file:///nix/store/xs74wcxq3qc12plfc70fds8inbndhcfm-bootstrap-tools.tar.xz' to '/nix/store/3fal4gikp92013kac6rdmfbrch2s859b-xs74wcxq3qc12plfc70fds8inbndhcfm-bootstrap-tools.tar.xz' (hash 'sha256-0LxRd7fdafQezNJ+N2tuOfm0KEwgfRSts5fhP0e0r0s='). Downloaded 'file:///nix/store/9ndpna6jrlac4y9fappdjm0sxx0g2bja-busybox' to '/nix/store/kb7wyy30y1gxcmdajljr26kxxac606qa-9ndpna6jrlac4y9fappdjm0sxx0g2bja-busybox' (hash 'sha256-OGO96QUzs2n5pGipn/V87AxzUY9OWKZl417nE8HdZIE='). ``` I used the hashes from the output above to create the `fetchurl` invocation which is part of this commit. I then started the bootstrap with the following command: ``` nix build -L -f . --arg localSystem '(import ./lib).systems.examples.riscv64' hello ``` As @lovesegfault requested, here are the the `sha256sum`s of all the `on-server` components for extra verification: ``` sha256sum /nix/store/${STOREPATH}/on-server/* ``` which produced the following output: ``` d0bc5177b7dd69f41eccd27e376b6e39f9b4284c207d14adb397e13f47b4af4b /nix/store/8a92pj40awdw585mcb9dvm4nyb03k3q3-stdenv-bootstrap-tools-riscv64-unknown-linux-gnu/on-server/bootstrap-tools.tar.xz 65f9433abb598f63c932d33351b14f686551512b1cece1e64c2d0e76aa0ec52e /nix/store/8a92pj40awdw585mcb9dvm4nyb03k3q3-stdenv-bootstrap-tools-riscv64-unknown-linux-gnu/on-server/busybox ```
3 tasks
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
This PR adds Hydra-generated bootstrap tarballs for mipsel-linux. I'll be following the script established in #151399, which I previously used in #168199 and #180223.
Files came from this Hydra build, which used nixpkgs revision 5bd14b3 to instantiate:
and then built:
I downloaded these files from Hydra with the following commands:
I then prefetched them into
/nix/storewith:And started the bootstrap with the following command on a mips64el machine (the
--arg localsystemforces nixpkgs to build for mips32 and the--option extra-platformsconvinces nix that mips64el machines can run mips32el code):I also edited
pkgs/stdenv/linux/default.nixto changelongsoon2f.nixtomipsel.nix. That change is not part of this PR; I will submit it separately since it may require more discussion than a simple bootstrap-files upload does.As @lovesegfault requested in #151399, here are the the
sha256sums of all theon-servercomponents for extra verification:Things done
${hello}/bin/hello